Added basics for testing