diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c9cd76e..1223fd53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,8 +8,33 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Execute CI script
-        run: ./ci.sh
+      - name: Setup Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      # - name: Execute CI script
+      #   run: ./ci.sh
+
+      - name: Build
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+
+      - name: Install SoftHSM
+        run: |
+          sudo apt-get update -y -qq &&
+          sudo apt-get install -y -qq libsofthsm2 &&
+          mkdir /tmp/tokens
+          echo "directories.tokendir = /tmp/tokens" > /tmp/softhsm2.conf
+
+      - name: Test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+        env:
+          PKCS11_SOFTHSM2_MODULE: /usr/lib/softhsm/libsofthsm2.so
+          SOFTHSM2_CONF: /tmp/softhsm2.conf
 
   links:
     name: Check links
diff --git a/cryptoki/src/lib.rs b/cryptoki/src/lib.rs
index 009a3ea0..8afdebbc 100644
--- a/cryptoki/src/lib.rs
+++ b/cryptoki/src/lib.rs
@@ -269,6 +269,7 @@ mod tests {
     use std::env;
     use std::sync::Arc;
     use std::thread;
+    use serial_test::serial;
 
     fn init_pins() -> (Pkcs11, Slot) {
         let pkcs11 = Pkcs11::new(
diff --git a/cryptoki/src/types/object.rs b/cryptoki/src/types/object.rs
index 2f37526c..4bf2de88 100644
--- a/cryptoki/src/types/object.rs
+++ b/cryptoki/src/types/object.rs
@@ -424,6 +424,14 @@ pub struct ObjectClass {
 }
 
 impl ObjectClass {
+    /// Data objects
+    pub const DATA: ObjectClass = ObjectClass {
+        val: CKO_DATA,
+    };
+    /// Certificate objects
+    pub const CERTIFICATE: ObjectClass = ObjectClass {
+        val: CKO_CERTIFICATE,
+    };
     /// Public key object
     pub const PUBLIC_KEY: ObjectClass = ObjectClass {
         val: CKO_PUBLIC_KEY,
@@ -432,6 +440,10 @@ impl ObjectClass {
     pub const PRIVATE_KEY: ObjectClass = ObjectClass {
         val: CKO_PRIVATE_KEY,
     };
+    /// Secret key object
+    pub const SECRET_KEY: ObjectClass = ObjectClass {
+        val: CKO_SECRET_KEY,
+    };
 }
 
 impl Deref for ObjectClass {